854f34dcc3
Test: make -j64 NexusLauncher
Change-Id: Ie2781017018b9c0397f2322399cbd0267c988296
(cherry picked from commit e294eadc74)