Test: make -j 32 Bug: 36461944 Change-Id: I92d111c05aa43ed5c6032ca13bd55f4f73c1bb35 (cherry picked from commit de477753)