Revert of Make secondary abi work for component build

build/android/BUILD.gn

Index: build/android/BUILD.gn
diff --git a/build/android/BUILD.gn b/build/android/BUILD.gn
index cfca168cbaba1f609461d0c260161793872bcc21..d0486020ad98226d49e8043562e397162e2c1224 100644
--- a/build/android/BUILD.gn
+++ b/build/android/BUILD.gn
@@ -70,7 +70,7 @@
 action("cpplib_stripped") {
   _strip_bin = "${android_tool_prefix}strip"
   _soname = "libc++_shared.so"
-  _input_so = "${root_shlib_dir}/lib.unstripped/${_soname}"
+  _input_so = "${root_out_dir}/lib.unstripped/${_soname}"
   _output_so = "${root_shlib_dir}/${_soname}"
 
   deps = [
@@ -91,9 +91,9 @@
     _output_so,
   ]
 
-  _rebased_strip_bin = rebase_path(_strip_bin, root_build_dir)
-  _rebased_input_so = rebase_path(_input_so, root_build_dir)
-  _rebased_output_so = rebase_path(_output_so, root_build_dir)
+  _rebased_strip_bin = rebase_path(_strip_bin, root_out_dir)
+  _rebased_input_so = rebase_path(_input_so, root_out_dir)
+  _rebased_output_so = rebase_path(_output_so, root_out_dir)
   args = [
     _rebased_strip_bin,
     "--strip-unneeded",