Android S Beta 2 (SPB2.210513.007)
Merge "Replace llndk_library with llndk clause in cc_library"