am f983730c: am af7855ff: (-s ours) am b08c24a3: Frameworks/base: Disable Clang in core/jni

* commit 'f983730c1c662063126826c891f7d94118a5be75':