Revert part of 223eace8e925de053e12141a771bdac8a06abfc3 am: 4e5d753c92

Change-Id: I764110dd3cacb3c2953afd38983b6f43b83811a2
tree: eb3870ac43bae9e3db4324013392a59aa206c8e6
  1. java/
  2. tests/
  3. .gitignore
  4. Android.bp