Merge changes I11074924,Ieb6b114e

* changes:
  Add initial stubs for MediaParser
  Add ExoPlayer dependency to frameworks/base