Merge "Added check for vendor module to parse-and-fix-errors" am: a198d93cc6
am: 90dc3bdcce

Change-Id: I20dce2b69a50639bb8a1bb3d535b4d3acb598429