Fix broken arc drawing in Camera app.

Commit f311e1983741e71e1632044bc8b2356d8688d29c introduced a recursion
abortion threshold, but missed properly handling negative values. Fixit.

Change-Id: I6776371d1567eba0a84d2e1bf702b46879e30332
Fix missing center clock and switch Msim center clock layout for CyanogenMod

This commit auto revert this one: https://github.com/cristianomatos/android_frameworks_base/commit/ea920fd4959db1ff28278f5e470f191ad9aed1a1

Change-Id: I88de443c39679e004ccc363b2431d25dff665004
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0