am a0cad2f5: Merge change 27078 into eclair

Merge commit 'a0cad2f5d19d95cfe496ebb82f3227dd4ed7c169' into eclair-plus-aosp

* commit 'a0cad2f5d19d95cfe496ebb82f3227dd4ed7c169':
  Fix generic build boot sequence.