Merge "rootdir: Create symlinks in Android.mk"