AOKP Bringup

Sorry, couldn’t revert so much, so restarted

Change-Id: I14271ccfc69211c13ee86b0d754887e1261f1f35