Merge "Merge "Add libstagefright_soft_flacdec to core_base.mk" into oc-dr1-dev am: 8fc04cc40a am: 5309a4758e" into oc-mr1-dev-plus-aosp
am: 733467e10b

Change-Id: I58f332ca5090a0f41ec96b0119f7af3ebc4cd821