Update Android.bp for upstream merge

Test: m checkbuild
Change-Id: I3741f5d18c26e8e9765b19b558e89cb98069eb6b
1 file changed