am 516d30d5: Merge "rootdir: Create symlinks in Android.mk"

* commit '516d30d5029c101ef32b600d3143513d3ce16933':
  rootdir: Create symlinks in Android.mk