Merge "Exclude mount entries for vendor overlay"
am: d184eb1fd9

Change-Id: I339fe43f4a070fb9bbb874ea6e62d7ea79d37420