Merge "Merge "Reduce hwui CPU time by using glDrawRangeElements" am: 057c7c3164 am: 94f4f5e45f am: b5facc7516" into oc-dev-plus-aosp