[automerger skipped] Merge "Add individual API tracking files for modules" am: 6360640cd8 am: 52464ea630 -s ours

am skip reason: Change-Id Iaf2ef5b5751eb208d119ddbc74481239366fe581 with SHA-1 dc033c35c0 is in history

Change-Id: Icf93c1b23cfd39d899ba517ec6940b1cbd1991cb