Allow herring to build s5pc110

Change-Id: I1dcd00b650c7f1cf3faa8905e0161e70fa3e57f1
Merge branch 'cm-10.2' into martincz