Merge "Remove Make side (system/test-)api-stubs droiddoc targets"