Cherry-pick image_format_properties changes from upstream am: 43227ff1db am: 40996a98...
authorPyry Haulos <phaulos@google.com>
Tue, 22 Aug 2017 18:32:37 +0000 (18:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 18:32:37 +0000 (18:32 +0000)
am: e6f0b0e41d

Change-Id: Iae16e8a7ff0467d44a27f01a3b29d14c2516f526


Trivial merge