Merge "Remove secontext.h, secontext.cpp, hash.h"
am: eb00112e09

Change-Id: Ie24ba4a5336a3a8537b43fa2996e53b0dbd85d74