am f833e0a7: am b9c2a66a: Merge "Now zoneinfo prebuilts are Android modules."

* commit 'f833e0a780d576be76520c1d0b51035f589cec0b':
  Now zoneinfo prebuilts are Android modules.