Merge latest AOKP sources.

This commits updates our Settings to the latest sources from AOKP.