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

Change-Id: I311d71a1a9f86429e5bac8ca4859dfadc90ee9ab


Trivial merge