Merge "Tracking dalvik.bytecode.* API changes"