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

* commit '24b6b12ecb393dcdd98f5723fead0682b6830ddf':
  Comply with new addjavascriptinterface enforcement