Build 64-bit mediaserver on 64-bit-only

This change also updates the mediaresourcemanager tests to be buildable
on both 32-bit and 64-bit, without adding additional libraries to the
system image.

Bug: 16890215
Change-Id: Icf8f1d0b098217d34bf27911a72346124588cc5b
diff --git a/services/mediaresourcemanager/Android.bp b/services/mediaresourcemanager/Android.bp
index d468406..e52f61c 100644
--- a/services/mediaresourcemanager/Android.bp
+++ b/services/mediaresourcemanager/Android.bp
@@ -1,6 +1,4 @@
-
-
-cc_library_shared {
+cc_library {
     name: "libresourcemanagerservice",
 
     srcs: [
@@ -24,5 +22,4 @@
     ],
 
     export_include_dirs: ["."],
-
 }