Merge "Revert "Camera: add NDK camera library""