Update for Soong java makefiles. am: e117602ffe
am: e6bd7bf804

Change-Id: Ie3a604c0bd82c02c4a50453462fd7e55c1dfdb4a