Add CMFota & OneClickAndroid support

Change-Id: I32f5862470b851cae3405e9c7f9705301af267ad