Merge "Camera: use gralloc mapper for handle import" into oc-dev