Revert "Remove platform availability from internal libs that make up"

This reverts commit 030f548d006b8f2d819d7a62cc8ebd8fe08c6483.

Reason for revert: Droidcop: Potential culprit for b/154165728 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: Id1faeba61ff1ba667fc36d14547d8d99a392ba73
3 files changed