Enable Trusty Gatekeeper 1.0 and Keymaster 3.0
am: 3a99f0fba1

Change-Id: Iaf343ad05b28691cfe4a9dada7d7db021ef0f961