Merge "Make JAVA_HOME absolute inside build"