Merge "Add Keymaster 0.4 binder API"