Merge "Fix ndk findId" into pi-dev am: 3e69b248ef
am: 416eeabc3d

Change-Id: I144f2d2905cab9151b1e884463bb24c41245ae0a