Merge change 24334 into eclair

* changes:
  fix [2037525] Fail to start camera after adb sync new Camera