Merge "Rewrite getentropy." am: a325151da0
am: 30ec992a62

Change-Id: I96adeca12637cccce761c4859bd7a983be7a55c9