Merge "Add libstagefright and  libstagefright_chromium_http to core.mk." into jb-mr1-dev