fix a can't boot bug

Change-Id: I2b4ae2d178ab27cf83d00ea170dcea91cda7ea05
Merge "fix a can't boot bug" into jellybean
update android src of [jellybean]

Change-Id: Ica2da3adac66e4c5d8ca41aa19d809a5f2f2322b
update android src of [jellybean]

Change-Id: I5ba268f3cc20f80cb8ac6321e867c2718d658f1d
update android src of [jellybean]

Change-Id: I6b586053e39cedb0c0522abe71e6fb02784f75eb
update android src of [jellybean]

Change-Id: I3d5363847dffcd2cf8bc4069f4b69a0c1e2dbebb
update android src of [jellybean]

Change-Id: I562bb35c166777d60cd3506ab383566ac749c4aa
update android src of [jellybean]

Change-Id: I4296cdf4a867d0953a1e60600040098e75f572a3
update android src of [jellybean]

Change-Id: I221a7a7ae7cf392812bd877e907a8c2cbb402723