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)
commit2c374ee3a248dce39c82b728b6d735cbe76db82b
tree062eebd4f9f463584db15723b4a1224fc6d0c560
parent6897aa1d74bc880f1e666daa630cda34e39a3756
parente14b1813e444e32b60c4bcd186242774519a3268
Cherry-pick image_format_properties changes from upstream am: 43227ff1db am: 2ede225b00 am: 12ead731f2
am: e14b1813e4

Change-Id: I732640c334d399d0a6b02dfb63761fb76d98e9b9