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

Change-Id: I660b36c7e5cbc4534a89cabf430a588397c8e786