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

Change-Id: Id21817bcae944e930ef094d683fecc83cf6e6098