Merge "fix regression from android_lookupEventTag_len()"