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

Change-Id: I6e11c6a1d7633ef4e5f9c9d2f7fff19306c7753b