Merge "AAPT2: Forward @TestApi in resource comments to JavaDoc"