Merge commit 'f9beb779bcbe1fb9f79d09ea6bcab8467c0f8009' of sso://googleplex-android/platform/external/sl4a into HEAD
Change-Id: I43fb8dee841b0148f87c4a59b6db924356a6b309