Snap for 12397575 from bfe93d418e60277a1e317756d8f987fb12056631 to 25D4-release

Change-Id: Icc452f81f9a6aa437489267837f350d5e0bdf1d2
tree: 347118ca7fb94cac62f0e991d5e8f0e2e115643b
  1. plugins/
  2. scripts/
  3. Android.bp