Merge "Update gradle build file for support v4" into lmp-mr1-dev