Merge "Change Android platform for when ANGLE is default"