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

Change-Id: I567257ab15938696a937de62a3d190d37a12f1c8