Merge "Android.mk: enable pppd on non-arm platform"