am bace0107: Work on issue #2259506: camera ANRed and then device runtime restarted

Merge commit 'bace01078259614f54c5082fae9ccdb37f27590c' into eclair-mr2

* commit 'bace01078259614f54c5082fae9ccdb37f27590c':
  Work on issue #2259506: camera ANRed and then device runtime restarted