Merge "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules...
Merge "Extends VNDK support in Make by setting LOCAL_USE_VNDK for modules going into vendor partition, except when they already have LOCAL_SDK_VERSION set." am: b777f169
am: fe9ba5ed
Change-Id: I9049593af944687aea3b9c664b75a03e025c4a96