Merge "Fix excluded sources to not include common sources" am: 85b36b8dd4
am: 441598918c

Change-Id: Idf9693c000edc305d318c09d4c0201b6905ca849