Merge "Exclude ndk stubs from notice file list" am: b923eb60cd
am: 376d29284a

Change-Id: I748095028e09742a61ecada07e25d918f9d4fd10