updates from cm-10.1
fixes build for m7