am f6dfd7b6: am ddc5a8f7: am 8ffec13d: Merge "Add back Java resources to apk without Java code."

* commit 'f6dfd7b608f4e53b83dcb0713447f3040a0790f2':
  Add back Java resources to apk without Java code.