Android 4.1 CTS release 1
Merge "Make viewport dirtyness calculations recursive" into jb-dev