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

Change-Id: I20fd69df8b25aa59f5e52c3b1cc5ab80c52d9849