Snap for 6937858 from d2d6d1156e627d6b9859aea52530f1e970f4e030 to sc-d1-release

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