Merge "Add OWNERS in external/scrypt" am: b7477d8eed am: e236788532 am: a0a2dc382e
am: 28f5f2d2a3

Change-Id: Ia3d87eabbdce6b5ca695c1ccf85fdf42ae887c4e