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

Change-Id: I7637dd9cc92c1f0ec3e9a24eba7df3039a3d87e7