Revert "Revert "Update makefiles for Java package path.""

This reverts commit a8789f27cb89496675483b83c76f271474085d62.

Change-Id: I69980b580a556188ba868bb096ae1590b01759f5
32 files changed