Merge "Don't truncate ${USER} when generating ro.build.fingerprint"