Merge "Merge "Fix google-explicit-constructor warnings in soundpool." am: feee33ce2c am: 17f1fc6c76 am: c80db139b3" into nyc-mr1-dev-plus-aosp
am: b63749b00e

Change-Id: I4a794cc9efb8da4a82c6b39c626266462277b94e