Merge "Remove <nativehelper/UniquePtr.h>"