Merge "Add instrumentation as a source tag for proguard keep options." into eclair