Update to new commits

Change-Id: If5cd734ba2e07ed82dc5215cd81ff0af0ca2d71a
diff --git a/Android.bp b/Android.bp
index 768e874..169b2cd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,10 +18,10 @@
 
     product_variables: {
         bliss: {
-            device_support_legacy_hwfde: {
+            supports_legacy_hw_fde: {
                 cflags: ["-DLEGACY_HW_DISK_ENCRYPTION"],
             },
-            device_support_wait_for_qsee: {
+            should_skip_waiting_for_qsee: {
                 cflags: ["-DWAIT_FOR_QSEE"],
             },
         },