Merge "Remove deprecated Android.mk files" am: 4d0dff7238 am: 5d15e090c0 am: a4878e0add
am: 36a301a0ef

* commit '36a301a0ef27d188ffb4b4ffde3d1d568f855c09':
  Remove deprecated Android.mk files

Change-Id: If6bb33fcb8111beb4d855e62fabb08d68dabe152