Fixes: 126190552 Test: make -j56 update-api Test: make -j56 Change-Id: I1c0700106e46b8dbfb825df341a8196a33f8bc83