Merge "Remove deprecated Android.mk files" am: 5a15aa25d9 am: 63fbc290a7
am: 3450a299f2

* commit '3450a299f25d24a8a7dde783d095acc8c5ed476f':
  Remove deprecated Android.mk files

Change-Id: Ic8e858921938ef0984e218a6b476c5febf76795b