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

* commit '35c144c2178875591d8e1ddc45064fa13b6bdc88':
  Remove deprecated Android.mk files

Change-Id: I2aebe634228803687cd600ab905d3b1c14b040a5