Merge changes from topic 'mark_vndk' into oc-mr1-dev

* changes:
  Add /system/lib/vndk-sp/hw to search paths for HAL impls
  Mark android.hidl.memory@1.0-impl as vndk-sp
diff --git a/libhidlmemory/Android.bp b/libhidlmemory/Android.bp
index 4af1fe7..59ce7a8 100644
--- a/libhidlmemory/Android.bp
+++ b/libhidlmemory/Android.bp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-cc_library_shared {
+cc_library {
     name: "libhidlmemory",
     vendor_available: true,
     vndk: {