scale_and_extend_frame{,_nonnormative}() cleanup. Change-Id: Ie99fd7af436ab2f6b3ef0c3f1a652fb26116d861