base: fix public api breakage

Change-Id: Ic25b507e66d42ae172cf031e97d14965d3a54aa0
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
add VoiceWakeup Settings value

Change-Id: I798d1ed9b2bda0fe8a36b8fa2bd17d74d2a09cab
environment: return external dir if secondary is not defined

If the device doesn't define a secondary storage, then return external storage
as secondary storage

Patchset 2: do not break the api

Change-Id: I9d94a01881f47977ef1a26c3648b3da1d8c63b57
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge remote-tracking branch 'upstream/cm-12.0' into cm-12.0