diff --git a/target/product/base.mk b/target/product/base.mk
index e9f43a7..846f69e 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -32,6 +32,7 @@
     framework \
     fsck_msdos \
     ime \
+    inputflinger \
     javax.obex \
     libSR_AudioIn \
     libandroid \
@@ -45,6 +46,8 @@
     libchromium_net \
     libdl \
     libeffects \
+    libinput \
+    libinputflinger \
     libiprouteutil \
     libjni_latinime \
     libjnigraphics \
@@ -70,7 +73,6 @@
     libstagefright_foundation \
     libstagefright_omx \
     libstagefright_yuv \
-    libsystem_server \
     libusbhost \
     libutils \
     libvisualizer \
@@ -97,7 +99,6 @@
     services \
     settings \
     svc \
-    system_server \
     tc \
     vdc \
     vold \
diff --git a/target/product/core.mk b/target/product/core.mk
index 56ee946..b321efd 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -29,6 +29,8 @@
     Contacts \
     ContactsProvider \
     DefaultContainerService \
+    DocumentsUI \
+    ExternalStorageProvider \
     Home \
     KeyChain \
     PicoTts \
diff --git a/tools/droiddoc/templates-sdk/assets/css/default.css b/tools/droiddoc/templates-sdk/assets/css/default.css
index f71d0a0..91b0f59 100644
--- a/tools/droiddoc/templates-sdk/assets/css/default.css
+++ b/tools/droiddoc/templates-sdk/assets/css/default.css
@@ -844,6 +844,18 @@
     width: 216px;
     height: 384px; }
 
+.framed-nexus4-port-216 {
+  background: transparent url(../images/styles/device_nexus4_blank_port_432.png) no-repeat
+scroll top left;
+  background-size:240px 465px;
+  padding: 52px 12px 52px 12px;
+  overflow: hidden; }
+  .framed-nexus4-port-216, .framed-nexus4-port-216 video,
+  .framed-nexus4-port-216 img {
+    width: 216px;
+    height: 360px; }
+
+
 /* landing page disclosures */
 .landing-page-link {
   text-decoration: none;
@@ -2649,6 +2661,7 @@
 a.notice-developers,
 a.notice-designers {
   float:right;
+  clear:right;
   width:238px;
   min-height:50px;
   margin:0 0 20px 20px;
diff --git a/tools/droiddoc/templates-sdk/assets/images/styles/device_nexus4_blank_port_432.png b/tools/droiddoc/templates-sdk/assets/images/styles/device_nexus4_blank_port_432.png
new file mode 100644
index 0000000..9d41aa3
--- /dev/null
+++ b/tools/droiddoc/templates-sdk/assets/images/styles/device_nexus4_blank_port_432.png
Binary files differ