Revert "Revert "Track AOKP's instead""

This reverts commit d4df7e6382cb896b75624f4f28e7673a43fcbf15.