Update loki to support att ota of d80010o

Change-Id: Ieb0eac1754f9c84c8ef2c4534bc7865262e052d3
Merge branch 'cm-11.0' into martincz