am 2f21659d: Merge change 24213 into eclair

Merge commit '2f21659d4565afd65da1be07c28317a3cb4287a1' into eclair-plus-aosp

* commit '2f21659d4565afd65da1be07c28317a3cb4287a1':
  Fix a bug that prevented the "generic" product builds from working in the emulator.