Merge "Remove special treatment of native method for CHA."
am: 60acc33c5b

Change-Id: I5686f5b24d2981e3ba622977708c3e4de78c7983