Merge commit 'ffecffc4c0d88dc61a78885addbf2480cc6f1c41' of sso://googleplex-android/platform/frameworks/compile/slang into HEAD
Change-Id: I030b0d149ec7ba4d4b0a8e3ffcf40200bc87e3cf