[automerger skipped] Remove Android.mk versions of modules that have been converted to Android.bp am: f7027fcfa9 -s ours am: eb3f1f8486 -s ours am: b5fac4a98c -s ours
am skip reason: Change-Id Id6491d2c254f691d2a410a59d50352f60b7ff352 with SHA-1 b036526abd is in history

Change-Id: I1eae8b1f096c9b0fc7fec8f07821f4408299e25e