Merge "Remove unused code in VoldUtil.h" am: e19189bd7f am: b6421644ec am: 923309aae2

Change-Id: I0ec249df609cbad7f80ac739545c6cf0199e6232
diff --git a/VoldUtil.h b/VoldUtil.h
index 6ef8cb1..ce6b411 100644
--- a/VoldUtil.h
+++ b/VoldUtil.h
@@ -17,10 +17,7 @@
 #pragma once
 
 #include <fstab/fstab.h>
-#include <sys/cdefs.h>
 
 extern android::fs_mgr::Fstab fstab_default;
 
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
-
 #define DATA_MNT_POINT "/data"