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

Change-Id: I71585786f688acc458c11f51b1182eebcaf93cb7