Merge "linker: remove COUNT_PAGES"
am: 859202c8e5

Change-Id: Ibd7f61d19a74909622b915015e7af46a52efe289