Merge & Fix build with cm-11.0
defconfig update & add pac_armani_defconfig