Merge "libsnapshot_test runs as root" am: 30abf7a9fc

Change-Id: I14c82cae7ec7b1c808340e7cbc4af94e0c4076a3