Merge "Use cc_library for libhidlmemory" into oc-mr1-dev