Merge "Use -Werror in external/scrypt" am: bcc2d0c8ec am: 1ef1ce7c0e
am: 9b1807ba4f

Change-Id: I46ba02355d43658274c97adb530b63f9794269ee