Merge "Removed HW encryption build flags and related code."