Fix de massive derp
Merge branch 'AOSPNXT' of https://github.com/jMelpri/platform_frameworks_base into AOSPNXT