Merge "Add individual API tracking files for modules" am: 6360640cd8

Change-Id: I0e1d85dc1bc3936ed849a86bff3a4722deb897d9