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

Change-Id: I0772f8063ee6a31cdc02a3b40fdadc298392762d