Merge \"Remove GOMA_HERMETIC form goma.mk\"
am: 14df2ef4d0

Change-Id: Ie9612d77fd35fb25aaad6db1b8c690b139cc1764