Port CM 10 Advanced Options to AOKP

Change-Id: Id4fa83b5aba665faf0e2c2ec1f48c816edf22800