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

Change-Id: Ib88c75d3c48d4f3137122d949a18723a34333a2f