Merge "DO NOT MERGE ANYWHERE: bumping cts to 5.1r3" into lollipop-mr1-cts-dev