Merge changes Ide5595c6,Icf56f2a1

* changes:
  Remove unused Android.bp files
  Update comment generated by gen_blueprints.py
diff --git a/r13/sources/android/cpufeatures/cpu-features.c b/r13/sources/android/cpufeatures/cpu-features.c
index d8c8e1f..e2bd749 100644
--- a/r13/sources/android/cpufeatures/cpu-features.c
+++ b/r13/sources/android/cpufeatures/cpu-features.c
@@ -69,6 +69,7 @@
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/system_properties.h>
 #include <unistd.h>