Merge "Address armv7-a-neon config issues" into lollipop