Merge commit 'f9d846fad41b174f5e535afa43893ac1e14a698b' of sso://googleplex-android/platform/external/lua into HEAD
Change-Id: Ib4dcf2ac1bd0ab2f82fcc075dd8a03e27d9ec5f8