am 42c6d163: Merge "Add empty libmedia_native in old location"

* commit '42c6d163aaf5170ac23a4d1e5baadddd0fb71406':
  Add empty libmedia_native in old location