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

Change-Id: If8cbaf672d3188315488b6f43765636d52fc1cb9