tree a03bf0496461237976f7de9a244228474df51626
parent 99341848129a0a17e024a7395aac6fa8eec9b578
parent 90b1a11858607850d1062e4286851a28c0f136fc
author Courtney Goeltzenleuchter <courtneygo@google.com> 1470957112 -0600
committer Courtney Goeltzenleuchter <courtneygo@google.com> 1470958963 -0600

Merge remote-tracking branch 'khronos-public/master' into 160811b-merge-master-to-android_layers

Update build-android/build.py and build-android/jni/Android.mk
to adjust for new shaderc build infrastructure.
Now pull shaderc from aosp to stay in sync with NDK builds.