am 231e01e7: Merge change I202c3106 into eclair-mr2

Merge commit '231e01e7922abae0b33f0aec95275a5cc1b0209d' into eclair-mr2-plus-aosp

* commit '231e01e7922abae0b33f0aec95275a5cc1b0209d':
  Make ContentValuesBuilder a separate file.