Snap for 6937796 from 2375946e24e4ea13f1d6d3a1ae97f923cb6fef28 to sc-release

Change-Id: I575fd8439ac42aa4dbe102333450c40484d704d0
tree: a5a14c990c74851796e24ddde06cf37e20ee83f7
  1. arm/
  2. arm64/
  3. common/
  4. x86/
  5. x86_64/
  6. Android.bp