Android 4.1 CTS release 1
Merge "Update doc package to r2. do not merge." into jb-dev