Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev