Merge "DO NOT MERGE Bump CTS version 5.1_r24" into lollipop-mr1-cts-dev