Merge "Rename system/core/rootdir/Android.mk to create_root_structure.mk" into main