Snap for 6660490 from 0f6002bffc84a181b476f07f1d1491aacffa8924 to sdk-release

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