Merge "Convert javadoc to Soong for device/sample" am: c08631332a
am: 27f36223bf

Change-Id: Id0c0a8884ec92b938b347f47c5467e5d07619d3b