Merge "Update makefiles to remove java-static libs." am: f1bef4107d am: e6cbd2db20
am: dffa8dcd87

Change-Id: Ib2994d436a10c1fdb7e507ccce775afde18bd82c