Audio.h upstream update
Use another way to fix Camera

Change-Id: Ib3ddd1671844901a85861ed19b542d9e22daa3d5