Merge "Swap libcore annotations for framework versions" am: b2a83841 am: da1171a2

package com.android.server.pm.dex;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UserIdInt;

import android.app.AppOpsManager;

import android.content.Context;

import dalvik.system.VMRuntime;

import libcore.io.IoUtils;

import libcore.util.NonNull;

import libcore.util.Nullable;

import java.io.File;

import java.io.FileNotFoundException;