Merge "AAPT: Allow including dependencies in dump command" into oc-dev am: 33644ff3f9
am: 32b7e187e1

Change-Id: Ia6f903b93aa2d8024e6ae03bac0e4bcae1149ac3