Cherry-pick image_format_properties changes from upstream am: 43227ff1db am: 2ede225b...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:32:51 +0000 (18:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:32:51 +0000 (18:32 +0000)
commit0ae2b42760152f8221d4178606eb6d8c3797b338
tree0f66720f37101399b46965daa076a35fa553dc32
parentd9d797935ba7c6b20f5cca35a12bfdf1732b595e
parent043191f5ad2bc66591e8ff3d7fca12340c5d8283
Cherry-pick image_format_properties changes from upstream am: 43227ff1db am: 2ede225b00 am: 12ead731f2 am: e14b1813e4 am: 2c374ee3a2 am: 21b557d3c3
am: 043191f5ad

Change-Id: I089f3bb3e64e7945468a03fb035f7f0838975050