Merge "Remove android_lookupEventTagNum() and related code"