Merge "Enable ANGLE-for-Android rule processing again"