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

Change-Id: Id4f1fcb632a25a7a44b04c44eacd3f089cd1e8ca