Cm 11.0 aosp additions

Seeing as this came from upstream AOSP, this needs built and tested first.