Merge "aapt: add support for optional uses-permission" into jb-mr2-dev