Bug 970936 - Fix intermittent failure in test_gallery_empty.py
Revert "Merge pull request #16166 from yurenju/comm-makefile"

This is breaking make install-gaia

This reverts commit e6f7bfd0c2f1e302375951d3a612c117e94a054c, reversing
changes made to d999becbdc7962e6491c7a0bf4d619b44da69373.

Conflicts:
	build/applications-data.js
Merge pull request #16174 from viorelaioia/bug_970936

Bug 970936 - Fix intermittent failure in test_gallery_empty.py
Bug 955626 - Change start_b2g wait in GaiaTest to wait for AppWindowManager to acknowledge the active frame instead of js event