Merge changes I6c35d2e4,If16c3e19 am: c3f32b95e5

am: 48fb5e27a1

Change-Id: I93102d773ec791d162cedfe050a9a8c5230a2bb4

otautil/Android.bp

@@ -44,7 +44,6 @@ cc_library_static {
         android: {
             srcs: [
                 "logging.cpp",
-                "mounts.cpp",
                 "parse_install_logs.cpp",
                 "roots.cpp",
                 "thermalutil.cpp",

otautil/roots.cpp

@@ -42,7 +42,6 @@
 #include <fs_mgr/roots.h>
 #include <fs_mgr_dm_linear.h>
 
-#include "otautil/mounts.h"
 #include "otautil/sysutil.h"
 
 using android::fs_mgr::Fstab;

updater/Android.bp

@@ -81,6 +81,7 @@ cc_library_static {
         "blockimg.cpp",
         "commands.cpp",
         "install.cpp",
+        "mounts.cpp",
         "updater.cpp",
     ],
 

updater/install.cpp

@@ -60,7 +60,6 @@
 #include "edify/updater_runtime_interface.h"
 #include "otautil/dirutil.h"
 #include "otautil/error_code.h"
-#include "otautil/mounts.h"
 #include "otautil/print_sha1.h"
 #include "otautil/sysutil.h"
 

updater/mounts.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "otautil/mounts.h"
+#include "mounts.h"
 
 #include <errno.h>
 #include <fcntl.h>

updater/simulator_runtime.cpp

@@ -32,7 +32,7 @@
 #include <ext4_utils/wipe.h>
 #include <selinux/label.h>
 
-#include "otautil/mounts.h"
+#include "mounts.h"
 #include "otautil/sysutil.h"
 
 std::string SimulatorRuntime::GetProperty(const std::string_view key,

updater/updater_runtime.cpp

@@ -31,7 +31,7 @@
 #include <selinux/label.h>
 #include <tune2fs.h>
 
-#include "otautil/mounts.h"
+#include "mounts.h"
 #include "otautil/sysutil.h"
 
 std::string UpdaterRuntime::GetProperty(const std::string_view key,