Merge "Added missing flags in run_build_test_target.py" am: 8ae7a8f8bb
am: c316b0a6de

Change-Id: Ia2e112cbb5e90ff9aef49a0ee1654f4d350df362