Merge "Update acloud from aosp-master aosp_cf_x86_phone-userdebug 5544955"