Update for Soong java makefiles. am: ff851b079c am: fdea7efd2c
am: 808094a5db

Change-Id: I8a1592d3cbf0b61b7ced2b6a5e6e4e5d53adda58