Merge "Have update_current.py include more Android.mk files in fix_dependencies.mk" into pi-dev