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

Change-Id: Ibfbc1f11eac0870a5eec7211c868fdcb38f395e0