Merge "Remove deprecated Android.mk files" am: ce5b4fee23 am: 5806404e4d
am: bfcb1b779f

* commit 'bfcb1b779fe6a4ce7fae4ba270bbf2483a8f84db':
  Remove deprecated Android.mk files

Change-Id: I2baf4e6a3ca6e2b2ca2b35c54c8c402ba4e5b16c