am 2918193e: Merge "Media NDK files"

* commit '2918193e0b792e089a8373817f3f485a037eca2f':
  Media NDK files