Build Subzero from the subtree directory.

The submodule is at /third-party/pnacl-subzero
The subtree is at /third-party/subzero

Bug swiftshader:47
Bug b/37478805

Change-Id: I2da86151f111448e962b6b24c085a2f288de18b4
Reviewed-on: https://swiftshader-review.googlesource.com/9608
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Corentin Wallez <cwallez@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index 395b41c..3670835 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -17,10 +17,10 @@
 
 ifdef use_subzero
 COMMON_C_INCLUDES += \
-	$(LOCAL_PATH)/../third_party/pnacl-subzero/ \
+	$(LOCAL_PATH)/../third_party/subzero/ \
 	$(LOCAL_PATH)/../third_party/llvm-subzero/include/ \
 	$(LOCAL_PATH)/../third_party/llvm-subzero/build/Android/include/ \
-	$(LOCAL_PATH)/../third_party/pnacl-subzero/pnacl-llvm/include/
+	$(LOCAL_PATH)/../third_party/subzero/pnacl-llvm/include/
 else
 COMMON_C_INCLUDES += \
 	$(LOCAL_PATH)/../third_party/LLVM/include