Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo