Merge "Remove deprecated Android.mk files"
am: 4d0dff7238

* commit '4d0dff7238a66882c16e7115bbf8e169fd363ce2':
  Remove deprecated Android.mk files

Change-Id: I45c6ec5ee4bc59912bed941c0c6da67f20c5fa51