Merge "Move Keymaster wrapper into support library."