Merge "hardware/qcom/keymaster: use proper nativehelper headers" am: 3587a1a811
am: 8edff26b02

Change-Id: I8a02d1f9f2429f684cec1f5a94195514891acf85