am c158427e: Merge change 22828 into eclair

Merge commit 'c158427e5edbac3ef180d1e35f99e445b11e3672' into eclair-plus-aosp

* commit 'c158427e5edbac3ef180d1e35f99e445b11e3672':
  Preliminary struct and union support.