Merge "Update makefiles after native handle in Java." am: 1847a2f2e7 am: fb6a66b3f7
am: 9dc1ccc852

Change-Id: I30fda77e5c5657c00f57a85b959dfd853d535366