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

Change-Id: I339fb6d110cc76ae7bc650736f94880789b0d5a4