Merge "Removed HW encryption build flags and related code."
am: bf8518056d

Change-Id: I969e9062b6c4d1827614d8272539489d26320f0d