Android m preview 2
Merge "Lose HAVE_ANDROID_OS from frameworks/compile/libbcc."