Merge \"Encoder: Added sample encoder config file to be used with avcenc\"
am: dcb9ea5cee

Change-Id: Ia191a5c7d258138eece79b6a240468d742fda894