Merge "linker: remove COUNT_PAGES" am: 859202c8e5
am: a6d0e5898f

Change-Id: I09f69399e84cbb154751858348d32e78e3b31f84