Merge "Move adb's selinux_android_restorecon up and check for failures."