am cf05e0c2: am 0969f15c: am ac08bc8a: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

* commit 'cf05e0c263bb9977480957049e7813b58276364a':
  Update Android CTS bandaid urls that use test_key1 to a new key