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

Change-Id: I1a57e6e6d01cb77012e536628819c69389e188a8