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)
commitd9d797935ba7c6b20f5cca35a12bfdf1732b595e
tree0f66720f37101399b46965daa076a35fa553dc32
parentaaf188164bb9cdc907b5df0c3cb1cb71c834e855
parente6f0b0e41d63ec14959d47861cb0b3d90e98889e
Cherry-pick image_format_properties changes from upstream am: 43227ff1db am: 40996a98a2 am: 3edf5fa179 am: 2e3f075e22 am: 91762df407
am: e6f0b0e41d

Change-Id: Iae16e8a7ff0467d44a27f01a3b29d14c2516f526