Merge "Implement #2964234: Add support for <uses-package> element to aapt" into gingerbread