Merge "remove overrides of (dead) onDrawTextRSXform"