b4a26016c4
This allows for easier organization of gradle project Test: Verified everything builds Change-Id: Idde32a0ccdf0c6cf0fca7898d7ad770b709fc1f5