Update for Soong java makefiles.
am: ff851b079c

Change-Id: Id08ea9e2f2912c2fb2ea0482aeb45f548849912c