Merge "Merge "vulkan: replace std::shared_ptr by android::sp" into nyc-dev am: ef6f4f0b am: 52ba4faf" into nyc-mr1-dev-plus-aosp