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)
am: 043191f5ad

Change-Id: I089f3bb3e64e7945468a03fb035f7f0838975050


Trivial merge