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

Change-Id: Ib1ec40973df44423ca5ddd1de05ac9d32ce8c6fe