Merge "Fix double close in NativeLibraryHelper.openApkFd."
am: 657650eaf0

Change-Id: Idde99d51da9babe9338db50962c025f96ab6637a