Merge "Include bionic/Android.bp"