Merge "Make private, single-assignment fields "final" in android.content."