Merge "Don't prune $(OUT_DIR) from findleaves.py" am: 6338f23a36
am: bad4b072de

Change-Id: Ie8fe8c7e3172f25f751a21276807c3046c795d93