Merge "Make JAVA_HOME absolute inside build" am: 194893ee6c am: bac4bd6973 am: 80bd8e47f5 am: 5d68c8927c
am: 41ca5a2e2d

Change-Id: I1884d33d3b2202e8da110fa7416130e773f62cfb