Merge "Fix excluded sources to not include common sources" am: 85b36b8dd4 am: 441598918c
am: 0a87e40095  -s ours

Change-Id: I9ccba4f367212811cda3d1250153e84f88024926