Merge "Generate fmq java-source." into sc-dev-plus-aosp