am ed368be7: Merge "Frameworks/base: Wall Werror in media/tests"

* commit 'ed368be79248d8e0a71c383b2ed6eb93b451810e':
  Frameworks/base: Wall Werror in media/tests