Merge "Make JAVA_HOME absolute inside build" am: 194893ee6c
am: bac4bd6973

Change-Id: I7378f983558fd70d031631187805dfc453297102