ref: 9a2dd7e67ed20a7389db618f1a8a25d5b3a3c89c
parent: d7caee2170f9413d26977418fdeabd45fe615707
parent: ef41c6286d1151dd6eeabea4e9160364f5aeee8e
author: James Zern <jzern@google.com>
date: Fri Sep 8 15:23:40 EDT 2017
Merge changes I9ec438aa,I99c954ff * changes: Update convolve functions' assertions Add 2 to 1 scaling NEON optimization