Merge "embedded.mk: +android.hidl.memory@1.0-service" am: c1a11ec83f am: fbeb6b5f8f
am: cfeaa71933

Change-Id: I0dd9004b41917caba17adc5af2a263212eef3da3