Fix build errors and enable blacklist support

Change-Id: Ib30651f175fbf67517f4105197efb84c7bdb2015