Merge "C2SoftHevcEnc: add gop support" am: ba14ba2bed am: 5bbb2707a3 am: 7f8374f54b
am: 183a8ba464

Change-Id: I1d9235f2f2189545067ac4ad8dc2ca9a95fb3158