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

Change-Id: I47de98067aa69898c83ae57d5771e7c39e8e12e8


Trivial merge