Merge "Add support for BOOT and VENDOR patch levels to keymaster."