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

Change-Id: I14f72ea1690068c1d8c5456a45549467ff3dcc4b