am a22000d2: Merge "DO NOT MERGE remove defunct javascript interface" into jb-dev

* commit 'a22000d244915df2098619be5fd66bf1c4d019c8':
  DO NOT MERGE remove defunct javascript interface