am 6f46166f: am 24b6b12e: Merge "Comply with new addjavascriptinterface enforcement" into jb-mr1-dev

* commit '6f46166f9695de1c3b8e7488b2c743b46ddca034':
  Comply with new addjavascriptinterface enforcement