Merge "libxt_quota - remove spurious divergence from upstream" am: e6cb0500d4

Change-Id: I1c8e7243cc74f8f6e03f111321332610db8e9eeb