am 5bff7130: am 605ed8bd: am 740270dc: am 1ca6c54c: 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 '5bff7130efa9ab7ff239f5cafd406c43c6b5ec41':
  Update Android CTS bandaid urls that use test_key1 to a new key