am 764b7f56: (-s ours) am e20a4194: am 516d30d5: Merge "rootdir: Create symlinks in Android.mk"

* commit '764b7f561ba5bcecd94b7dd342bab2bf8cc287b7':