Merge "MediaPlayer: hide BufferingParams API" into oc-dev
am: 4c2a62edb6

Change-Id: Ib1b36bf7efe6aea88fa3f370e6e20d897c98b734