Merge pull request #3 from omnirom/android-5.0

[2/2] settings: add CPU info overlay