Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables." into lmp-dev