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

* commit 'e20a4194b8faacc542aee519a62a01954376be60':
  rootdir: Create symlinks in Android.mk