am cdf768fe: (-s ours) am f3cd170c: am 3470855e: Merge "rootdir: Create folders in Android.mk"

* commit 'cdf768fe7c13f1dfae2bde6fb6d32b8400d56393':