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

* commit '9e2218c97d2b5482cad90ebee846a203089850e0':
  Remove deprecated Android.mk files

Change-Id: Ic9ba33eff4e2874bbe246e85f3d2f842900410f1