Merge "AAPT2: <uses-library /> and <library /> don't need to be Java packages"