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

Change-Id: I25daec095ddbdcf84f3b1955c4d088d28f1d726b