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

Change-Id: I4a06323199f74d9828222c523299e86927f6c9ef