Merge "Add LOCAL_ADDITIONAL_DEPENDENCIES support to BUILD_PHONY_PACKAGE"