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

Change-Id: I8a6fa664e6e1ef439b02ac22883318a1f328a4e7