ResourceTypes consolidation w/ linaro

Change-Id: I72fbcef4626684c4da4169d734641bd2c5cb59d1