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

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