This will well isolate contributions for original code, generated code and SIMD (especially for Android). Change-Id: Ie47664decc7f43c2f57260a72cab951c347281a7 (cherry picked from commit 6c62841076)
6c62841076