Cherry-pick image_format_properties changes from upstream am: 43227ff1db am: 2ede225b...
authorPyry Haulos <phaulos@google.com>
Wed, 12 Oct 2016 18:00:35 +0000 (18:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Oct 2016 18:00:35 +0000 (18:00 +0000)
am: 21b557d3c3

Change-Id: I861d0aa58ffc50e6d0981aad5aa6820634119d58


Trivial merge