Merge "Move libc.debug. props to libc_debug_prop" am: 339df6263d

Change-Id: I4bbb1d08e393e619f2392bb7d7320b0134928cdd