Merge "Libcore: Add filter upgrade function to DexFile" into nyc-dev