Merge \"Have LOCAL_ASFLAGS honor debug/non-debug configuration.\"
am: dedde3f10d

Change-Id: I1f100a448444db257f422558fa7150340303fbdc