Update for Soong java makefiles.
am: e117602ffe

Change-Id: I391015e0584b21eabe8fcec95777a25b4acad84f