Merge "Merge "Merge "Merge "Merge "DO NOT MERGE Bump CTS version 5.1_r24" into lollipop-mr1-cts-dev am: 2c56569cab  -s ours" into marshmallow-cts-dev am: 82ab2a842b  -s ours" into nougat-cts-dev am: f8114d4c0c  -s ours" into nougat-mr1-cts-dev am: 8a7fa4daf1  -s ours"