Bug: 114242886 Test: make dist -j owners make dist -j module-info Change-Id: I6d00928c25e3213a5563e64806e0c04530161581