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

Change-Id: Ie45ea20d706e5c43d09b30be3e71021c207b771e