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

* commit 'aa1bd6dec676ab81e14ca428427d2b8c627c83fa':
  Add empty libmedia_native in old location