Android 4.1 CTS release 1
Merge "Fix p2p service discovery" into jb-dev