Merge "Removed HW encryption build flags and related code." am: bf8518056d am: 95dc636942
am: 730c6196a2

Change-Id: I3a24fffb05b8376f60d085f73354266cb4b4295d