Merge "Clean up Makefiles, remove HOST_JDK_IS_64BIT_VERSION" am: 3669fbc4c9
am: 5977a3cb18

Change-Id: I5b60ba77c77a8e635cfc1f495f07b217eb486cee