Merge "Add libstagefright_soft_flacdec to core_base.mk" into oc-dr1-dev am: 8fc04cc40a
am: c194d53411

Change-Id: I2e4c216726d3bcf6a732165e71c7c00bfa688ed3