Snap for 7321546 from f5661e3e132dcd5845dcefe993fae6fcc86aae8c to sc-v2-release

Change-Id: I886bf59fec590a09084bb7d7fdf8907046abd98c
tree: 93e3052adf92c222d615e80688d6e3062488d520
  1. current/
  2. Android.bp
  3. OWNERS