Update to richard master tip

* fix Amara support
* fix Firefox and nonfree codecs
Enable Amara support