Merge "Cleanup libbacktrace Android.mk"