Cherry-pick image_format_properties changes from upstream am: 43227ff1db
authorPyry Haulos <phaulos@google.com>
Wed, 12 Oct 2016 17:31:47 +0000 (17:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Oct 2016 17:31:47 +0000 (17:31 +0000)
commit12ead731f29ceb6e90082726ca69f458d0b592c3
treee42c30c0d7d6cf963b8be9de63e888fbcbfb6293
parent9ddfc1fee23110f4e5315aff47fc50dee898eb85
parent2ede225b00b4baa3ea95e4919efb0ff3b1f00e40
Cherry-pick image_format_properties changes from upstream am: 43227ff1db
am: 2ede225b00

Change-Id: I8373112a6c00da3c0edae493981e9e033d27d47d