Merge "Nativehelper: Remove static locals for field and method IDs." am: 8578b4e373 am: 1340a9b7a7
am: 69839c0bfa

Change-Id: I86fae50eeb7847dab7352dbd48a1dafc59a8652c