am 06acf91f: am 3b85269c: include build timestamp in OTA metadata

Merge commit '06acf91f65015f8588f2621b89b8088b4664f9a3' into gingerbread-plus-aosp

* commit '06acf91f65015f8588f2621b89b8088b4664f9a3':
  include build timestamp in OTA metadata