Merge "LOCAL_PROPRIETARY_MODULE implies LOCAL_USE_VNDK" am: 3952eef8ce am: 7dbc8e08ce
am: ba5a198625

Change-Id: Iaa40b19c94c425b74a93d64c33bc5aa06f8c2690