Add possible modifiers to non-Class Classlikes

This is to pull out integration test diffs from the companion-inner-static-class CL
Test: integration test diffs

Change-Id: Ida075eb740a5bf2104a9fa8a8fe762ae22482bce
225 files changed