Merge "Have unittests run as the bluetooth user and add file system tests"
am: cf5470c3f2

Change-Id: I8701df1f1ec23a3d8bbd7fc2e2ca1e5730b6ef05