Merge changes If5c3dcc9,Ia8be7b9c

* changes:
  Allow media.codec and media.extractor to specify two policy files.
  Unify media.codec and media.extractor Minijail usage.