Merge "Change memlock rlimit to support eBPF feature"
am: b7d831e198

Change-Id: Ia413d9e5ca6059821956cc64de9e1ab0d925fb71