Snap for 6877830 from 3b31acdd497fdcba9942f16b2988dc02be7cc993 to sdk-release

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