Buttery AOKP flair

Change-Id: Iec4a3781750644a28357b903aa1c88a47744ffb1