Merge "Add Android.mk as a dependency as well"