am aa82f8ee: am 357f5bc8: Merge change I7397e6fe into eclair

Merge commit 'aa82f8ee8f747e4466f3f6754201765a2b5b3707' into eclair-mr2-plus-aosp

* commit 'aa82f8ee8f747e4466f3f6754201765a2b5b3707':
  add the new accounts and sync package to the generic target and enable sync for all builds