am ca7466d2: Merge "Make bionic\'s dependency on the tzdata explicit."

* commit 'ca7466d2b8ee6baad86afc82fa18cda4d931b6d3':
  Make bionic's dependency on the tzdata explicit.