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

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

Change-Id: Id0f4cae2385c5c749e0df77ac9d3afa7702fe943