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

Change-Id: Ibabd8a7517df444c97a4d1eb0793b9179b2a121f