Merge AOKP (master) into master