Cherry-pick image_format_properties changes from upstream am: 43227ff1db am: 40996a98...
authorPyry Haulos <phaulos@google.com>
Wed, 12 Oct 2016 17:46:48 +0000 (17:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Oct 2016 17:46:48 +0000 (17:46 +0000)
am: 91762df407

Change-Id: Id785f8fcec0d401b6bba5cf17e469ae37e47d4c8


Trivial merge