Merge "Fix "missing libpuresoftkeymasterdevice.so" issue on boot of cuttlefish."