acl: Reapply previous fix for leaks

Merge commit ad95c945 ("Merge tag 'google-common-android-3.18' into
'msm-3.18'") inadvertantly reverted portions of commit 4333a7d3
("ANDROID: fix acl leaks"). Reapply the portions of the fix that were
reverted.

Change-Id: I5773b28bb68d31deecf374b480a38622c59d8e9c
Signed-off-by: Dennis Cagle <dcagle@codeaurora.org>