Turn on error for the EmptyBlockTag bug pattern and fix related problems Change-Id: Ie29dfc15cb26121d1cebf031058826c6bffaa892