libcxx: Update Android.bp to match Android.mk

Change-Id: Iffe0b0c13a23d15a6cc2c7805fc4f99477e230a4

Android.bp

@@ -14,8 +14,14 @@
 // limitations under the License.
 //
 
-LIBCXX_SRC_FILES = [
+// host + device static lib
+cc_library_static {
+    host_supported: true,
+    name: "libc++_static",
+    clang: true,
+    srcs: [
         "src/algorithm.cpp",
+        "src/any.cpp",
         "src/bind.cpp",
         "src/chrono.cpp",
         "src/condition_variable.cpp",
@@ -41,31 +47,14 @@ LIBCXX_SRC_FILES = [
         "src/typeinfo.cpp",
         "src/utility.cpp",
         "src/valarray.cpp",
-]
-
-LIBCXX_C_INCLUDES = [
-    "external/libcxxabi/include",
-]
-
-LIBCXX_LOCAL_C_INCLUDES = [
-    "include/",
-]
-
-LIBCXX_CPPFLAGS = [
+    ],
+    local_include_dirs: ["include"],
+    export_include_dirs: ["include"],
+    cppflags: [
         "-std=c++14",
         "-nostdinc++",
         "-fexceptions",
-]
-
-// host + device static lib
-cc_library_static {
-    host_supported: true,
-    name: "libc++_static",
-    clang: true,
-    srcs: LIBCXX_SRC_FILES,
-    include_dirs: LIBCXX_C_INCLUDES,
-    local_include_dirs: LIBCXX_LOCAL_C_INCLUDES,
-    cppflags: LIBCXX_CPPFLAGS,
+    ],
     rtti: true,
     whole_static_libs: [
         "libc++abi",