Android S Beta 1
Merge "Replace llndk_library with llndk clause in cc_library"