Annotate remaining AMEDIAFORMAT variables

Test: build
Change-Id: I9a37defebd6824ec994887f88958a949228d1da1
2 files changed