Merge "Exclude ndk stubs from notice file list" into oc-dev