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

Change-Id: I732640c334d399d0a6b02dfb63761fb76d98e9b9


Trivial merge