Merge "Fix linux_bionic build of python3" am: 0ddaf14e0a am: c6e5a8acb8

Change-Id: I9adac5102a0bc4a82984909bb25d6fc3480dea46