fix google error (Master key bug) by implementing cm libcore with google changes
Merge branch 'new' into jb-mr1
Merge pull request #22 from pcarenza/jb-mr1

Jb mr1