Merge "Permit /system/lib/vndk-sp/hw/ for 'sphal' namespace" into oc-mr1-dev
am: 42a2f5c992

Change-Id: Ifad4a6062b24db1a56994eae4776096f94cf3d07