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