hikey960: Update PRODUCT_SHIPPING_API_LEVEL to 30 and FCM to 5

Update PRODUCT_SHIPPING_API_LEVEL and FCM for hikey960 so they are
at 30 and 5 respectively.

Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I16f433543ea8c828777da7f548b85652fabd75bd
diff --git a/device-common.mk b/device-common.mk
index 02e4795..89682f8 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -34,7 +34,7 @@
 # Set vendor kernel path
 PRODUCT_VENDOR_KERNEL_HEADERS := device/linaro/hikey/kernel-headers
 
-PRODUCT_SHIPPING_API_LEVEL := 29
+PRODUCT_SHIPPING_API_LEVEL := 30
 PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
 
 
@@ -86,8 +86,8 @@
 PRODUCT_PACKAGES += vndk_package
 
 PRODUCT_PACKAGES += \
-    android.hardware.drm@1.0-impl \
-    android.hardware.drm@1.0-service
+    android.hardware.drm@1.3-service.clearkey \
+    android.hardware.drm@1.3-service.widevine \
 
 # Graphics HAL
 PRODUCT_PACKAGES += \
@@ -108,10 +108,17 @@
 PRODUCT_PACKAGES += android.hardware.bluetooth@1.1-service.btlinux
 endif
 
-# PowerHAL
+#
+# Power HAL
+#
 PRODUCT_PACKAGES += \
-	android.hardware.power@1.1-impl \
-	android.hardware.power@1.1-service.hikey-common
+    android.hardware.power-service.example
+
+#
+# PowerStats HAL
+#
+PRODUCT_PACKAGES += \
+    android.hardware.power.stats-service.example
 
 
 # Software Gatekeeper HAL
@@ -246,7 +253,8 @@
 PRODUCT_COPY_FILES += \
     device/linaro/hikey/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.common.rc \
 
+
 # Health
 PRODUCT_PACKAGES += \
-    android.hardware.health@2.0-service \
-    android.hardware.health@2.0-impl
+    android.hardware.health@2.1-impl-cuttlefish \
+    android.hardware.health@2.1-service