am 6ef19dad: Merge change 7040 into donut

Merge commit '6ef19dadbf1f2e35551d2bf559b0d533f77b366d'

* commit '6ef19dadbf1f2e35551d2bf559b0d533f77b366d':
  CTS: Add media test cases to CTS makefile