[automerger skipped] DO NOT MERGE: Make LocalMediaPlayer use a same mk file for pi-car-dev and master branch
am: 4c7a2e9787 -s ours
am skip reason: subject contains skip directive

Change-Id: I68f9fc06138b937d1a9a6ae28a9b074f0a304e45
tree: ba0494853a4a29c27815ca9be3f1b999812d28fa
  1. proto/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml