Snap for 6830825 from af94a1c25317a125b341f869c4900990206fb88f to sc-d1-release

Change-Id: Idaa9991dc64c1b0eae861851d90df8bd0506b086
tree: e67f720984bacb763fa054c650e0163bf695e3e3
  1. com/
  2. Android.bp
  3. import-maven-artifacts.sh