Snap for 7321546 from b06d36c4180184d0396b6af5127f9e1f685695d3 to sc-v2-release

Change-Id: I3ec319210a6adf3494a08a2a024b5d3fe0e3a37f
tree: c4eadc83ef3ca9e9f324d71f0c42cf45d97fc910
  1. current/
  2. Android.bp
  3. OWNERS