Merge "Add symlink for getconf(1)." am: a9f6197390
am: 7881e4f365

Change-Id: If68a157738a0756915ad1ce021085a952325fb3f