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

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