Revert "Revert "Move resource storage to attachment base."" Fix in https://chromium-review.googlesource.com/#/c/263730/ This reverts commit 0d91328b99d2a8b2c3bfe45d64faad3e7907637c. Change-Id: Ibab792001798eff94652345b7c12fb9a42cddb55 Reviewed-on: https://chromium-review.googlesource.com/263740 Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Jamie Madill <jmadill@chromium.org>