Add Gmock

Change-Id: I047d6cfae642be3b6d71b2fb29a265f9338d7ad9
Merge remote-tracking branch 'cm/cm-12.0' into default
Don't track our own m8
Enough commits have been merged into the CM repo that we do not need
this anymore.

Change-Id: Ic8981fe1bc635fd9428e40d23eeced0a17d84802