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

Change-Id: I04eaa5808c5c1372d7d92fe1b4ada4391fbd4499