Merge branch 'android-5.0.0_r6' into HEAD
Merge remote-tracking branch 'cm/cm-12.0' into HEAD
Merge remote-tracking branch 'cm/cm-12.0' into HEAD
if BONE_STOCK is true build with ART_TARGET_DEBUG_CFLAGS

else
build with ART_TARGET_NON_DEBUG_CFLAGS

Change-Id: I5fcafe755adc95e697e64bf730d65cbaca2d6973
Merge remote-tracking branch 'Vanir/L5' into cm-12.0