Merge "Use shifted value for sinpi8sqrt2" am: 8a88e03ea0
am: ecc49c9499

Change-Id: If782ecf6d96300ab66c8ae3baf76ab29f8491735