Revert "Adding GSI keys" am: a78276f77d am: ccba64d4ff
am: 4cc1642a27

Change-Id: Idda606624f36135d9f6b3951621da9a7f2505e7f