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

Change-Id: Idffd7efa21e10690011a299b041b3b5491108480