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

Change-Id: I1741af4772226298b1782f8a718f39da3cdcf849