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

Change-Id: I1e2f47b4cbedc7d1a49c33620d0ac4feba97c29f