Revert "staging: android: use braces on all arms of if"

This reverts commit 220f115e
("staging: android: use braces on all arms of if").

Change-Id: I0e915296ec01597084179c77ee7d505340788edd
Signed-off-by: Ingrid Gallardo <ingridg@codeaurora.org>