Add Android.bp am: bc6b7ea93f am: 1f45ac1e33 am: 03bbb32fd1 am: 07aab6791d am: 3e1f58746a

Change-Id: I83fbc9ec1aca3ce93168cac004d634a9841507de