am 85948576: am 4ff253ff: Remove JSON License from NOTICE file

Merge commit '85948576f0270265ebeca795f41447ad4f549c11' into dalvik-dev

* commit '85948576f0270265ebeca795f41447ad4f549c11':
  Remove JSON License from NOTICE file