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

* commit '01807290f932c905750644ae4dad4c331fb8cca4':