Merge "Clean up CodeItemAccessors and Compact/StandardDexFile"