Update #1

Rebased config to AOSPA and AOKP