Merge "Added libstagefright_soft_aacenc to all builds of all products"