Merge "libaudiohal: Dynamically load appropriate HIDL shim library" am: 74773d7374 am: bdd76a920b

Change-Id: Iab64b37edc78808fb3edda4bd1e442c69948847a