Merge "Revert "[core][trusty] add keymaster module""