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

Change-Id: Idde37ba245a46a265a3697b14c3f0a90cc956d43