Merge "Convert javadoc to Soong for device/sample"