some inclusion fixups for bionic

ps2: fix whitespace
     clarify outter else/endif with comments referencing the if they're associated with

Change-Id: If826db7bbce95b30ad2bb40e98f8e4d7df6ec2ea