fuji: switch to AOKP appropriate branch