Merge "Remove unnecessary Android.mk" am: 7052f3d45d am: 6993933fc6
am: 0d6bbbcc1e

Change-Id: I23bd6e6751db2aac43904e7aa0c0d9c6661a96d1