am 3690959f: am 98bbbe7f: am e96d44a0: am 83e63821: am bc8c31e4: am 335482c4: Fix make files for unbundled tree builds

* commit '3690959f713f342dd3b38ac4395354bdd529f860':