Merge "Parameter checks for sensor NDK APIs, fix map file"