Merge "Revert "libkeymaster1 was split into libkeymaster and _portable""