Merge "Add empty Android.mk to prevent recursion."