Remove deprecated Android.mk files am: d8de81f217
am: a804678e0a

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

Change-Id: Ifcb78229b25eeb69992028a322e5fff1bd560ebf