Merge "Update makefiles for Java package path."
am: 698b6a9614

Change-Id: I57d2eb340433ef462a73aaad9d0b969d7c3456b1