Revert back to the current AOKP's setup.

Change-Id: I8150d30098e2cf2fe701bf9e28be920322709ab7