toro: fix spacing in prop overrides

Sorry guys, my fault for submitting this without thouroughly checking
it :(

Change-Id: I831a61e411162fe29c3c0c71f4c1d3cd3d8ea23c
Merge remote-tracking branch 'cm/cm-11.0' into HEAD