Add FM support

Change-Id: I69c5c9f7ac0727d5b6792f68ae69ab57187e6cef
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	mk.dependencies

Change-Id: Icfcc35076265696aa3ded7536b55f7bf9193c498