Merge "Snap for 5234541 from b651a1c9a39342ca3810ff5575c2471714cc176c to sdk-release" into sdk-release
tree: ac6f7b1c49adc54092bcd2a3f4f0394a6bb071f8
  1. java/
  2. Android.bp