am f02a02c2: am e1e94c7d: am fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev

* commit 'f02a02c2150e9f80bb6a4ec2b5f388aa9693bc85':
  AAPT: Fix printing of resource configurations