Index: lldb/trunk/source/API/SBPlatform.cpp
===================================================================
--- lldb/trunk/source/API/SBPlatform.cpp
+++ lldb/trunk/source/API/SBPlatform.cpp
@@ -378,7 +378,7 @@
     PlatformSP platform_sp(GetSP());
     if (platform_sp)
     {
-        ArchSpec arch(platform_sp->GetRemoteSystemArchitecture());
+        ArchSpec arch(platform_sp->GetSystemArchitecture());
         if (arch.IsValid())
         {
             // Const-ify the string so we don't need to worry about the lifetime of the string
Index: lldb/trunk/test/functionalities/platform/TestPlatformCommand.py
===================================================================
--- lldb/trunk/test/functionalities/platform/TestPlatformCommand.py
+++ lldb/trunk/test/functionalities/platform/TestPlatformCommand.py
@@ -33,8 +33,11 @@
 
     def test_shell(self):
         """ Test that the platform shell command can invoke ls. """
-        if sys.platform.startswith("win32"):
+        triple = self.dbg.GetSelectedPlatform().GetTriple()
+        if re.match(".*-.*-windows", triple):
           self.expect("platform shell dir c:\\", substrs = ["Windows", "Program Files"])
+        elif re.match(".*-.*-.*-android", triple):
+          self.expect("platform shell ls /", substrs = ["cache", "dev", "system"])
         else:
           self.expect("platform shell ls /", substrs = ["dev", "tmp", "usr"])