Merge commit 'b5fb50a1' into eclair-plus-aosp * commit 'b5fb50a1': Add instrumentation as a source tag for proguard keep options.