Merge "DO NOT MERGE Disable webkitsecurity package" into jb-dev