Increase Text Size Of CPU Info Overlay

Change-Id: I62526e5644adab165edeb1b7f4a6fb86f68e06e2
Revert "Camera: Adds support for meta data callbacks"

This reverts commit 5c71159639186e1a379f2949a2a847fc0f7b5b63.

Change-Id: I1f80c6a482df96275ce016e3981210b603b22dd3
Revert "Change Default Animation Speeds"

This reverts commit dcfc46c3caca088d87b393a353fec5bc48639121.

Change-Id: I90abac684e1dc4e940dd26d12d278b5704dcfce3
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2