Android S Beta 2 (SPB2.210513.007)
Merge "Moving the JAVA_BINARY variable to be initialized properly"