Merge "android: Fix platform parsing of sys.version" am: da73c62a0e am: a216e5115f am: fdae8f2296
am: b6ef433362

Change-Id: I0d28ba52d0d09cc4ad8bc2a44ba74f1dba15383a