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

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