Merge "fix regression from android_lookupEventTag_len()" am: 9fa133cc28 am: 6df6448930
am: 41afee2152

Change-Id: I27f7337ea47d104aff55a62258f38f54d48fce9a