Android 4.1 CTS release 2
Merge "DO NOT MERGE Work around for use-after-free cert bug" into jb-dev