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

Change-Id: I0acf1c73d3b8ad5d949ba96d11e65fcf703b8423