Bug: 231345733
Test: mma -j $(nproc)
Test: ./build.py
Tag: #floss
Change-Id: I649216d42d4bb204845941c5fba738ff27e43a3a