Merge "Camera: sort NDK getCameraIdList output" into pi-dev