Merge latest PA and AOKP sources.

This commit puts our Framework/Base up to date with PA and AOKP sources. I've already compiled a test ROM and I didn't get any errors while compiling.