Merge "Use sp<>::make in external camera HAL"