Merge "Fix ndk findId" into pi-dev