Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev