Merge "gn2bp: Add Android.extras.bp support"