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

* commit 'b4943598bc91100fe4eef76e658adb6ce1e87f04':