Merge "[LSC] Add LOCAL_LICENSE_KINDS to dalvik"