Fix Android.bp for renamed files.
am: 9dd52f4300

Change-Id: I427e66958539a7cddee95a2cb07055c3b80c1b9b