Snap for 7482035 from 8da3f621b09e384b11029ce0213f782fdf284de9 to sc-d2-release

Change-Id: I0eef8ab5cd5e797327cb74d5a612f730b1feb620
tree: 778d8c8da2ebf2701bc020d2963b35b4934b8159
  1. java/
  2. tests/
  3. .gitignore
  4. Android.bp