am fc36efee: Merge "Fix comparison of String8 to char* literal"

* commit 'fc36efee6f6aefb561f92ef88c8eb40ac0aefa94':
  Fix comparison of String8 to char* literal