Tweak project structure

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=129212987

gradle.properties

 ## Project-wide Gradle settings.
 ## Project-wide Gradle settings.
-#
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-#
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-#
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-#Thu Feb 04 15:49:07 GMT 2016
 android.useDeprecatedNdk=true
 android.useDeprecatedNdk=true
 buildDir=buildout
 buildDir=buildout