Merge "Comply with new addjavascriptinterface enforcement" into jb-mr1-dev