Build for goldfish at cm11.0

Change-Id: Id2b613111a8eb766637285cf2764f6f9cb772a74
Merge branch "cm-11.0" into kylin