Merge "Suppress implicit-fallthrough warnings in nuplayer*." am: daba8f4f19
am: 4eabdc1237

Change-Id: I814792ed988e4dfdb077ff121ccf360bd779e593