Merge of Sony Release 14.1.G.1.518

Change-Id: Iaade9329f284b15442fe35b2f42c18ef14615c92
honami: add CM defconfig

Change-Id: I369edeec945c8d4c9495c0d77a57acc79b4780de