am 7988d7f8: am 83dd0cef: am 1d4ac0f9: Merge "Update Android CTS bandaid urls that use test_key1 to a new key" into jb-dev

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