Merge "Update makefiles for Java package path." am: 698b6a9614 am: 1f8c3cd2f2 am: 39c5cdf8fb
am: 5c4f5c2922

Change-Id: Id08e304a19e9b6a309cec7eac2f698baf1bf5706