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

* commit '63fbc290a70a54f1e5bdb87cdfb61ba80fc81f8a':
  Remove deprecated Android.mk files

Change-Id: I87ead0d5057941af916064ad3febfd21f7634360