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

Change-Id: I7b9e1a5b32c83ee563527a1e5b35ef5dc8e1d0d0