Merge "Annotate remaining AMEDIAFORMAT variables" into pi-dev-plus-aosp
am: 6962967aec

Change-Id: Ie131c16d9f6a40f39d38d48af222ba0246dfa12a