update branch / fix 404 url

Updates branch to jellybean-mr2.1 and fixes a bad URL

Change-Id: I905a5a4ed9e6be80e4d4c7448e6db1b3128a55f4
Merge "update branch / fix 404 url" into jellybean-mr2.1