Merge "keymaster: add 4.0 to compatibility matrix"