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

Change-Id: Ia5aa3989670fc5d86bfcba18a88cd48883c211db