Merge "llkd: switch to std::literals" am: 0e7dc30874
am: 9357ff4a13

Change-Id: Ibe5242d69187dd42fb2c98fcb6be2f3b3c8d123e