Merge "Revert "libbinder_ndk_unit_test: shutdown wait time to 20s""