Merge branch 'android-4.9-llvm' into android-4.9

Change-Id: I1f31f4da0c8cbf99c43f74d7190bd5b21b123d41
Signed-off-by: Greg Hackmann <ghackmann@google.com>