Fix build with cm's msm8974 (despite this not being cm's g2-common **shakes fist**)

Change-Id: I3bba7f2be243297607ea2b6555092430a45af3dd
As this repository is redundant with some of the stuff in a repository that isn't an amalgamation of a pretty good repository with a pretty bad repository, with fixes for compatibility with an alpha CM repository that's not even in their github, its loki conflicts with g2's loki

Change-Id: If801037b58e0a4257e00f820d9c67a7f8ad5a563