Merge "AAPT: Allow including dependencies in dump command" into oc-dev