Merge "Add LOCAL_VENDOR_MODULE as a synonym to LOCAL_PROPRIETARY_MODULE" am: d69837deea
am: 6acc699303

Change-Id: I382bbf77b3068b9d70a9cc2619d585938ac6718b