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

Change-Id: Icc46d5f670aec79652c1de0d989ee070db9a51b9