Merge "Let blueprint.py skip searching Android.bp in out dir"