Sync up with About.

Change-Id: Ica1b99d03b9f5c211d11374f6cdad4fcf2fafec6
Fix false negative when test ran twice in a row.

Change-Id: Id3712a9f45a92603e0c3bf89b9be9fd08d4d546f
AJAUDIO-9: Don't touch the PCM mixer if we're using the Master mixer.

Change-Id: I7b48acca844e24caba785d7199d93d5087467653