Merge "Revert "raviole: remove redundant includes"" into sc-dev
diff --git a/conf/init.raven.rc b/conf/init.raven.rc
index 9eb01b9..e7ba699 100644
--- a/conf/init.raven.rc
+++ b/conf/init.raven.rc
@@ -29,7 +29,7 @@
exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g6.app
# Face
- exec_background /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app
+ exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/faceauth.app
on property:mfgapi.touchpanel.permission=1
chmod 0600 /sys/devices/virtual/sec/tsp/cmd
diff --git a/device-oriole.mk b/device-oriole.mk
index 1ca4cad..63d69b8 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -82,3 +82,6 @@
device/google/gs101/tts/it-it/it-it-x-kda-r21.zvoice:product/tts/google/it-it/it-it-x-kda-r21.zvoice\
device/google/gs101/tts/es-es/es-es-x-ana-r22.zvoice:product/tts/google/es-es/es-es-x-ana-r22.zvoice\
device/google/gs101/tts/es-es/es-es-x-multi-r22.zvoice:product/tts/google/es-es/es-es-x-multi-r22.zvoice
+
+# Keyboard bottom padding in dp for portrait mode
+PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_b=10