Reattach some comments to what they apply to.

Also remove comments about runtime_options.h that have been copied out
of their context (they're only relevant in runtime/Android.bp).

Test: n/a - comment change
Change-Id: I03753f273c148937ce04d4e0b44f3ec4b2303d27
2 files changed