Merge "Update copyHAL.sh after changes in libaudiohal" am: f2212ca85c am: 2bd5e654fb

Change-Id: Ied67aafb6e84507a11a738b7c1c099be72893e67