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)
commite6f0b0e41d63ec14959d47861cb0b3d90e98889e
treebb7654ba7482a9dfe09b941b8631fac53174a3bd
parent42b75f69931d0086d497ee8195185258e686aa59
parent91762df4079e1ea4426160973f741dce4915c4a9
Cherry-pick image_format_properties changes from upstream am: 43227ff1db am: 40996a98a2 am: 3edf5fa179 am: 2e3f075e22
am: 91762df407

Change-Id: Id785f8fcec0d401b6bba5cf17e469ae37e47d4c8