Fix Android.bp for renamed files. am: 9dd52f4300 am: 8d9a316d1f am: 714425abe0
am: 80aa93fba4

Change-Id: I38d12b22ef92171afc974afade0e1222f7f1d4f3