Merge "Remove deprecated Android.mk files"
am: 95800fe1ce

* commit '95800fe1cea79136934ecd02c6b6f8a064d0007e':
  Remove deprecated Android.mk files

Change-Id: I52e37a344bd97cc09aff72470b0cabdb190a9812