Merge "Annotate remaining AMEDIAFORMAT variables" into pi-dev-plus-aosp