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

Change-Id: I31fd1fd8fb78cc8ea1516e1e309b654c68f1fc69