Merge "Remove deprecated Android.mk files" am: bce209f5b5 am: f229833a18
am: b8dfea451f

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

Change-Id: I4eb32975fb0ea671de7ea40309ef33ec00ccc3c2