Merge "surfaceflinger: Make all sources depend on Android.mk" into lmp-dev