Merge "Fixed issue with supplying numerical compileSdkVersion, test manifest outputting variable names instead of package names, updating build tools version." into developers-dev