am 5da8a5ff: am 7f9db64d: Merge "Add libstagefright and  libstagefright_chromium_http to core.mk." into jb-mr1-dev

* commit '5da8a5ffa2c06ba0cf598bcc13feda950990f6e5':
  Add libstagefright and  libstagefright_chromium_http to core.mk.