Make libbcc, libbcinfo, bcc no longer depend on libcutils and libutils.

Bug: 34396220
Test: mm and CTS tests pass
Change-Id: I9a5e608dfc2a92e411da5c7cff2406209052715d
diff --git a/bcinfo/MetadataExtractor.cpp b/bcinfo/MetadataExtractor.cpp
index fbcd883..431e586 100644
--- a/bcinfo/MetadataExtractor.cpp
+++ b/bcinfo/MetadataExtractor.cpp
@@ -21,9 +21,6 @@
 
 #define LOG_TAG "bcinfo"
 #include <log/log.h>
-#ifdef __ANDROID__
-#include <cutils/properties.h>
-#endif
 
 #include "llvm/Bitcode/ReaderWriter.h"
 #include "llvm/IR/Constants.h"
@@ -32,6 +29,10 @@
 #include "llvm/IR/Function.h"
 #include "llvm/Support/MemoryBuffer.h"
 
+#ifdef __ANDROID__
+#include "Properties.h"
+#endif
+
 #include <cstdlib>
 
 namespace bcinfo {
@@ -356,7 +357,7 @@
   // adb shell setprop debug.rs.precision rs_fp_full
   // adb shell setprop debug.rs.precision rs_fp_relaxed
   // adb shell setprop debug.rs.precision rs_fp_imprecise
-  char PrecisionPropBuf[PROPERTY_VALUE_MAX];
+  char PrecisionPropBuf[PROP_VALUE_MAX];
   const std::string PrecisionPropName("debug.rs.precision");
   property_get("debug.rs.precision", PrecisionPropBuf, "");
   if (PrecisionPropBuf[0]) {