Merge "Revert "Revert "Force gtest to use adb unroot if required_root is false...
Merge "Revert "Revert "Force gtest to use adb unroot if required_root is false or not set""" am: f7e6870f
am: 4d4d939d
Change-Id: I9dbee6ad583e28daa82dbd3665989b1ded093864