Merge changes Ib2a3c881,Ia9b17f4e

* changes:
  trusty/apploader: Handle APPLOADER_ERR_NOT_ENCRYPTED
  trusty/apploader: Add missing doc for enum value