Merge "DO NOT MERGE CTS 5.1_R13 release (Bump version to 5.1_r13)" into lollipop-mr1-cts-dev