Merge "Remove deprecated Android.mk files"
am: 5a15aa25d9

* commit '5a15aa25d948e9f45d1223d5ede773fb763981c9':
  Remove deprecated Android.mk files

Change-Id: I0865ff237be47350e92983792c14db5b14bef404