add Heimdall

Change-Id: I2d0dbe3075a1758a7edf2e3d80d0a832a492c493
Merge remote branch 'cm/cm-10.1' into cm-10.1