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