correct Manufacturer to Motorola

Change-Id: I2786ff4abf61e35fafc92c76245ed4a8b71dc903
Merge branch 'cm-10.1' into martincz