Bug: 36698966 Test: run two 'make -j' executions in parallel in each of two terminals Change-Id: Ief91391fe1f0fdbf9655cc0ba1298e353396d705