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

Change-Id: I6cafeb0cfdada6f2f80801504e595d76c2ed47c3


Trivial merge