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

Change-Id: I3b3e3b90f5692566742b18025a40932728e87569