Merge "Add Android.bp" am: 42134b99b5

Change-Id: I6f7fca153d9470ed27326b871278deb42b7c3565