Conflicts: proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so Change-Id: I786fa1f8da270acb8d48c515f8fb2f6eb83f9783
382a5286