Merge "Add KM_ALGORITHM_TRIPLE_DES to keymaster_defs.h"