apds9190: Fix gcc 4.7-induced failure

The int init function wasn't actually returning an int, and while the
default assumption for that case was OK with older compilers, it
failed hard with 4.7 resulting in random behavior
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2