am f3cd170c: am 3470855e: Merge "rootdir: Create folders in Android.mk"

* commit 'f3cd170cdbc1950a9c5efffb5c41c346c4cba298':
  rootdir: Create folders in Android.mk