Audio V4: Copy 2.0 audiohal to 4.0 am: 4bcd67fbb4
am: 6e41f65717  -s ours

Change-Id: I6fb1d3d804bd49e09c1722194a457c3d7dff42f2