Added Some XPerience Stuff and fixed problems with build form last commits forket from CM

Change-Id: I27303b8b52691d1c30cc42f17e80070796349a75
Signed-off-by: klozz <xxx.reptar.rawrr.xxx@gmail.com>