Merge "Update HWUI makefiles to support use by other targets (e.g. Skia)" into nyc-dev