Update last patch with newest PS from AOKP

Change-Id: Ib74619d31b333174720733c2f789c355454ed5f9