Cherry-pick image_format_properties changes from upstream am: 43227ff1db am: 2ede225b...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:32:16 +0000 (18:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:32:16 +0000 (18:32 +0000)
am: 42b75f6993

Change-Id: Id066ba0e162ed18c6db284b1f8b70a2775396884


Trivial merge