Merge "Fix gensyscalls.py to actually use the input argument provided in bionic/libc/Android.bp." am: 6595551e28
am: 8719712e03

Change-Id: Ic1a78f2ccc5f45eee449de623bb1a023558fc64f